Better fix for last commit.