Possible fix for issue #25