add when guard