Handle expect properly