Fixed bug exposed by EE3.