Trying to fix the bug