BugFix on Interpan