ugly fix for #88, will investigare further if it's valid