potentially fixes #14, fixes #15