fixes #25, fixes #24