rider hardcoding fixing.