(Final) fix to last commit