use this until pr is merged
1.0.5