Events JS Fix