BugFix strict standard