#77 issue solved