Fixed bugs on Fun.html