fixed expect issues