Fixed extension to work with 3.6.