a bit of work
fixed corner case in load request handler