Possible fix for #146