Fix bad code mergin on last commit