actually this is a slightly better fix