Added solution for GBus