some issue fix.