Temporary solution for the 'command failed' bug