Fix for PR#111