fix base problems