issue #384 (legacy)