Fix : Issue #2