Fixing factory to better check for .Rx