fixes #5494