Fixes #3299