Fix set command bug