Issue #330 - partial fix
Issue #333 - fixes the alert only, not the issue completely.