Bugfixing on the logic.

Signed-off-by: Nico Magni <nicomagni@wolox.com.ar>
Ready the over pass of the pieces.

Signed-off-by: Nico Magni <nicomagni@wolox.com.ar>