fixed datalifecycle issue#21