fix for bug USERGRID-22, ICLA - Malaka Mahanama