more fix for #2