removed some temporary bug for oliver