bug fixes
bug fixes
bug fix in core