2nd try on dakrorbin fix