rc0.9 bug fix