Fix for PR #149