Change as per ugexe's suggestion on mailing list.