Fix for issue 225