Preserve 0.2 compatibility