Change in handling
Bugfix