Yes, you're right. My friends also not native speakers :( so, in some cases that wouldn't help.
Thanks for reporting! Gonna fix it :)