Fix Android and iOS