#75 issue solved