Added tonyrq's PR