#31 issue solved