Bugreport: fix it for now

till someone get time to recode the whole thing

Change-Id: Ie28d56a40d790b93973d0abd799d95eeafe624d0