Event handlers path fix