Fix QA #158