Fixed with latest commits