bugfix to address splitting