Bug correction.
First working version