fixed

@linabasheer review code please.