Incorporates fix for GH-199