Merged fixed from full version to free version.