Issue #341 solved