fix bugs unblock