updated to use BugHandler