Time problem fix