fixes #18, fixes #19