Fix same behaviour as shown in saltstack/salt-cloud#378