config support
bug fix