this fixes #16