Issue sdk22

Temp patch to solve Issue #114