possible fix to issue #13