clustering should be correct now.