Fix for the new feature in QS