Fixed issue with breaking change on EventSource