Included workaround for MacOS timestamp issue