Add fix for pony-mode