semi-fix for #329