Minor bug in QS-2815 fix