Preserve backward compatibility with 0.2