potential fix for #24