Contrib 4170

Fixed tracking for the hotpot module