fixes 71

@settinghead please review and merge. thanks