fixed almost