fixing some mistakes made in last commit