Fix bug on history screen