Final chance to get rid of this line