Some changes
Bugfix.