yek bug fix shod