#743 implemented (not tested)