Before 0.5.1 branch