Fixes #3241