Time Plugin Fix