Fix for CLOUDSTACK-1112