Maybe fix event binding issues on refresh