Fix bugs on syntax