Better on-load behavior