Fixed rules bugs!