Fix interval issue