Fix for CompositeOperation