fix rollbar #7
fix rollbar #8