Remove missed line and also improve code for bridge cases
Catch up with code change. Pointy-hat: myself