fixed the hot issue
playing around with master