Fixed tagged builds here as well