fixes #24