bug fix
bug fix in  core module
Core issue changes