Possible fix to #12