Added and fixed a bug in base changer