Added conditional to ensure it works with fresh install