Framework v1.0530 bug fix