try to fix bugs