correcting duplicated call to controller bug
Merge remote-tracking branch 'origin/master'