Framework v1.0529 bug fix