Made it also compilable with compiler < 7.2