Fixing bug again.