Fixed bug with unit carry over.