Fix no. 3