latest fixes for fekro bekr