partial fix II