Fix for issue QS-2363