partial fix.