this fixes #24