#372: Fix after review