Fix for on-the-go feature