Fixed an issue found while user testing