Fix #3 : more laziness in the pre-computing optimization