Revenge loading

@Pasa is/was also having this issue.