Applying Rob fix