potential fix for #30