Fix for iOS issues