2.18.1.143 sample bugfix/performance improvement