Language bug fix