Backed down to 0.6.1