Changes in the Code Trapping this stupid bug events

Gotcha :)