custom fix for #116