Fixed : Issue #4