Fix QA #157