Bugfix for salt 0.15