Can this check be moved to above the sourcing of common?  See the unity target