Core rules fix

Merged into core