Fixed sample, updated when-traverse.