Fixes testcrew/adcs-issues#1