adding fix for #187