Commiting the fix for JCLOUDS-509