Added an event to prevent the following...