Issue 123: after review of the last change