[#15] Fixes to divider length