Trying to fix ordering issue