simplified the fix