partial fix for #52