Fixing some remaining of the same bug.