Attempt to fix require order