- Improved on load behavior

Signed-off-by: Christian Schepp Schaefer <schaepp@gmx.de>