Update of wrap around rules
merge fix