Finalizing bugfix from previous commit.