Gandalf fix