Quick fix because of nuke and pave