fixed some events