Github PR: fix behavior. Closes gh-1, closes gh-2.