Fixes self reference in block