Fixes #2606