works now on 2.2.x devices