Fixed objectives again