fixes #103, fixes #104