Fix for null languages