non-necessary group creation is fixed for sources in Block

If this is fine, we can apply it for all other cases