Fix CLOUDSTACK-3215
As in https://issues.apache.org/jira/browse/CLOUDSTACK-3215