FIxed commit issues