Minor Fix/Enhancement