Correction of last comit

Some corrections, should work now.
Revert "Correction of last comit"

This reverts commit a6a1bed7c0ca0b9813f75243b43405cfb4fdd5fb.