Issue #510: feature done, need to be tested