compatibility with 3.3.5 added