attempt to fix + bug