fixed wrong eventListener
Merge remote-tracking branch 'origin/layer4'