Possible fix for #155