Temporary fix for the double times issue on Android. We need to do a regression test on iOS on this one. Fixes #65.