Fixing according to @coleifer's remarks