fix the issue #2 for milestone0.0.3