Finesse code, support release case fully