Fixes #3329