Shaheen selector fix