Fix for #566. Also fix wrong identifier being used in text.