Small structural fix