Fixed working for 2.x devices