Possible fix for issue #92, if it's even an issue