BusHandler project fixed