Fix: Separate/merge surfaces

A bug that occasionally prevented surfaces from being merged and separated has been fixed.