Fixed crash bug, removed notify