Fix : Issue #4