Fixing QS issue...