Ticket #1681, Renato seems to have done the right thing here, just be a bit more smart on the information that is already there.