Hopefully fix a chicken/egg bug.