Fix: full implementation of Rule 1