Fix for cross device compatibility.