- This way, no magic has to be used and it's ready for a possibility of configurable refresh
- Also, a possible inconstency was fixed.

Refs #219