Added support for version 10.36