Fix: bug with incorrect base