Revised last fix to improve results