Bug in previous reworking