Fixes #2615