Fixed swing bug