minor change and bug fix