Fix dividers handling