Fixed merge conflict on da43a7c