Fix : part of Issue #5$