Edit Event Bug Fix