Workaround some issues in BEGIN/END moving to IC