"Bug CON-68" fixes. 

Hi 
i have fixed the "Bug CON-68".  Do a pull and review it.