Fixing some trimming