minor modifications
bug fix