Making things work.

Signed-off-by: Baudouin Duthoit <baud.duthoit@gmail.com>