Refactoring Fix for ISsue #385