comit by jayli bugfix