Fix #1, thanks so much to @fwilson42