partly fix for #1