Commit for 3.0+ compatibility