Added bug/enhacement.