Fixing awkward workding