fix for 2.6?