bah, will just fix it for 2.6