Fix QA #146