fix bugs for closing forward