Fix command.py as well.