Manually fix bug, correct rules to match fix