#324: fixed simulator