Fixed to handle not have a qs