Better handle last step