Fixing the bug possibly?