Fixed 510 - Trimming in the wrong position