Same functionality needed like on init. I assume @jzaefferer advised me to do so ;-)