Fixes #2671