138.x compatibility (issue #8)