Bug/#253 issue

#253 issue solved