Issue #35: Change condition for alert