Fix: dumb code cleanup has broke some logic