Fix castle freezing