Improved fix for last commit.