fix #1, resolves #6