Issue #217 fixes some scenario problems