TODO: cross-reference with Github issue #1