[3.8.6] Wrap into block