Fix crash on loading commands, this may be a complete fix