Ashkan: some bugs is fixed.