Modification to remove errors in Moore!1563 (merged).
It is ready to be tested together with Moore!1563 (merged).