#21 fix crash after last commit; it shoud be CP20932 in the comment of last commit