1-24 bug fixed