Adding fixes interval handling