Fixed: return skater button flickers on and off, see #206