Follow intuitive fix for Bug1