Fix special command handler