Complete the bugfix

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge pull request #2 from lem9/patch-2

Complete the bugfix