New patch from Marc St-Onge.