Fixed it correctly this time