Rebuilt for 0.19