Minor Fix final