Issue #95 back to old scenario