Fixed standalone version.