Okay, changed to xoft's partial fix