This issue has been fixed in 2.2.x versions onwards along with the new refactorings introduced. However 2.1 branch is still has this bug.