Yeah, refixed the bug in better way.