* Temp fix to work around time issue