Fixed last step