Trying to fix the bug again