[#1571] Make only needs to be run once