possible fix for #27