Fixes #3493