Bug 16

Depend of Bug #15 and #18 fixes.

Fix bug #16.