feature/rouksana fix bug