Fix for PR#126