Fixed second instance of the same bug