Fixed up baseline overwriting - not sure how it was working before and now it wasn't