Fixed mistakes from last commit