Correctly handle floating clients