Fixed swap error