Fixed issue with using wrong command object