build fix, bug fix