Handle event maps and is on calculating correctly #670