Fix for issue 217