Fixed command aborting.