Fix: broken feature