Fixes #2818.