@javaerb: Yes, you're right. Thanks for notice. Fix pushed below.