Fixed issue in base.set