resolved with latest commits