fixed bugs events