Make rule more comprehensive