Fix  QA #141
Fix QA #156