Another bug alike to the two previous commits.