Bugfix : ISSUE #5