You are right. 
Can you do the other changes so i can merge this PR ?