Fix for issue 72.