Namespace corrected #2359