Fixed moving to to_base logic issue