Patcha 2017-0979-Edit