Enhancement and bug fix.