possible fix to #2365