Command fixing.