Fixed old code; dev 0.2.2