Fix for issue 208