Fixed command handle twice