BugFix in methods