PR/1.3.3 on issue #32