Commit type-casting fix