Final fix for PR#74