Fix huge bug on commitment creation