Merging additional fix. Need new release.