Fix for issue 89