bug fix and bundle update