fix for #30