fix bugs in previous push