Fix require to work more predictably