Partial fix.