Fixes #2701