rc 0.9 bug fix for deployment