Fix QA #149
Fix QA #150