fix bug: account for qualifier