Bharti| #1125| refill button/event now works always. Not unregistering events anymore