Fix values. Again there must be a better way