fix for #24