minor improvement, fixes #2, references #13