Fix Registered Samples