Fixed defcommand macro