better handling for XFS