fixes #3910

This is better