bug fix, style tweak