last commit had bug, fixing