Fixed Regression
Fixed regressive behaviour that was caused by making the events/actions static.