corrected the fix stuff broken during the refactor