fix so that common files work