tiny optimization
Merge commit 'b099'