Last fix didn't really work well.

This one should work better.