2.1.2 quickly fix an bug in 2.1.1. I'll consider add spec of no polymorphic senarino