Committing fix for WSAS-1710. Patch by Sajith