Fixed HotW again.
Merge commit '246ace861756640efb425fd866cfd53628316d7f'