This was already fixed in 4.9 with CL-2640654. If the issue is still happening please report as a new ticket with details and comparisons as this would be a regression and not the original issue reported here. It makes it easier to track and assign out.
Thank you!
Tim