adding fix for #226