Follow intuitive fix for Bug1

Intuitive fix, it works unfixed and fixed