issues #433, #432