Fix multiple divider on rebuild()

Divider was not removed on rebuild so each rebuild would add a new divider.
Merge pull request #286 from conradfr/Fix-multiple-divider-on-rebuild

Fix multiple divider on rebuild().