fixed some issues with rules for v1