revert to 1.0.0 behavior
1.0.6