#33 GIBS-619 Fixed time detection for cases where period is specified