Fix for Issue 29 (languages)