Fix the filled square bug