fixed the odd bug (see todo for details)...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>