Fix for compatibility with 2.x devices