Fix bug in times not being repeatable
Package up