Tweak to make compatible with 0.2 and master.