applied rest of the fix