Fix for set commands parameters