partial fix for #43