import fixed for 2.6