Fixed on demand defaults