v1.0.1; fix helper functions