added 3.3.6 support