QS: Fix Crash

Fix crash related to cr merge