Don't create duplicate Surface
s in fj-operations
#1168
Merged
Surface
s in fj-operations
#1168