better fix to #78