Fixing bug & first-run logic for #23