Fixed for 1.7 and new features.