Patcha 2017-1348-Edit