#100 first try to fix this issue, test not running so i can not check it