trying to fix bugs