Apply previous fix only on iOS