Commit map buggy