commit by jayli bugfix