Bugfix

Merging changes