Fixes #606. Also fixed the alert message to keep it consistent with the message, along with the documentation.