Fix alerts issue