Simplify the fix