Fix for issue no. 31