fixes #15, fixes #16