hopefully fix tick handling