Need review: fix for 11, conflicting :q parameter