Implement partial workaround for issue #1.