Fixed some issues when adding the 17 rule