Fix bug in main.gsp
merge step-3-3