update and fix for 1.0.0-RC1