Fix issue with generating the commands