Fix temp swing code