Fixed 2.16 and 2.17