possible fix for #82