fixing hot issues