linux changes for Issue #3