BugFix for some samples stuff