fixes #111 et al.