Fixed last commit implementation