Fix #13 - changed new "lazy" API