Wow, fixing for pre-0.11