A slightly better fix than the last version.