fixing for new builds