Fix, somewhat