Fix for PR #152