Another shot at fixing the no command id bug