Some fixes. Now it can work