Possible fix for #162