Conditional evaluation fix for Repos