trying to fix the bug