Patcha 2017-1124-Edit