fix 51 issues