Fixing mistakes in last commit