Merge "Fix IllegalArgumentException problem"