Fix for issue 17.