add OnApp 3.1 compatibility