Fixing for 3.5