Galaxy bug Workaround