Possible fix for #305