Final. Bug fixed.