fixing an endless loop in edge because of composite surfaces

1 job for dev in 3 minutes and 25 seconds (queued for 8 seconds)