This is better, but not perfect.