Better yet, move the call to a safer place

Signed-off-by: Suki <suki@missallsunday.com>