Fix ugly for loop, v 0.1.9.