Fix for issue #83

Another go for fixing issue #83