another attempt to fix the timezone issue