Bug fix Events