Improved  patch attached.