moved the fix to another method.