Fixed block's function ownership issues