re fix bugs