Fix for issue 234

Fix for  issue #234