Reverted back the "when" version

Reverted back the when version, changed by mistake