Should fix Breakline bug