fix bug + comment for warning
merge