Fixes #2338