@karnem @ahmedk: please carefully check this one. @ahmedk I think you handled the bug this fixed, but check, as the "when" parameter is definitely needed.