Added support to version 10.36