Tweak to removed Derived To from correct sample