ahlstromcj Left out a fix for issue #216.