Before v0.1.4 work proper