Ashkan: two bugs is fixed: