iOS and android now handle time correctly