[Review] Quick fix 1.1