Fix bug #17 on rollbar