Fixes #2601