Commit for #645