consolidated fix for #29