fixes for v1.0.23