more fix for #1