Fix DOM, Issues #13