Fix for issue number 208