Fixed 3.17