Fix for SlowCheetah issue