FIX: restore consistency with master