Fix for Remove Access for Sample