Adding fixes. and constance.
Conflicto