Merge pull request #380 from ZappoMan/master

build buster fix?