Fix for issue 4 - RemoveRoot not working correctly.