move this below the next if thing, to avoid splash prematurely