trying to fix the bug still