Fixed double-require issue