Really, is the better solution. But it can be fixes after merge ;)

Thanks.