Some changes

Bug fix