Fixed on demand transparency

Reffs #1755