Fix for last commit #2.