Bug fix for commands which were not launching correctly