Temporary fix? (continued)

That would be a pretty useless commit without this.