Fixed popup not resetting values