* Actually fixing bug with timeEmitter due to previous changes