Fix to support latest meck