Fix: bugs