before 2 release
bug fix