Fixes partition problems caused by #3612



Fixes #3887