bugfixes event detection