Fix: cannot just remove check