fix the issue #1 for milestone0.0.3