more fix for #125