SubEventPanel Bug Fix