rocaelh
committed
on 20 Jul 06
adding check for on_load in case is not sent