Fix QA #152