Internal Functional Issues Correction