Fixed incompatibility with Xposed 2.6 beta 1 (2)

Refs #1659
2.0.22 stable
merge