Issue 342: fixed