FIX: updated old `control` tag with `with`