Fix building as for v0.5.6