Fix for bug no. 168