Corrected an issue where the no_local flag was not functioning correctly.