Fix some regretions problem