[BugFix] Bug #343 resolved