Surely a patch could fix this?