Fixed issues with event subscriber