Fix finding existing encoding and committing