Fix for two event problems