Workaround for bug on 2.3.x devices