Wish I were convinced this revision will do the trick...