Compatibility with gryb 1.9x and 2.0