CLOUDSTACK-6791 Fixed the issue