Fix QA #101, #102