Fixed last commit changes