[fix] tiny fixes for correct logica