Attempt to fix where