Fixes #2881