Chain fix (issue #1)