fix for pull#32