Fix command/interface