For pre-0.3.0