Fix derp On-The-Go