Fixes #2981