fixed for generic roll issue.