Fixed double command problem