Fix : Issue #3