Fixes #2659