Fixed command calling