Slightly better fix :)