Changed extension method
Fixed merge conflict