The House Rules Expansion fixes this