fixed base bug again