Fixed bug exposed by analysis pass