Issue/fix compile 9

Only 5305972010a362b458de604faf809b95350fb51d is relevant.