Made it compilable with 7.1