Added fix for iOS from isaac​alves