This piece of code was older than this patch... Updating!