Bug Fix: language attribute is never null